# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1239.1.12 -> 1.1239.1.13
#	arch/ia64/kernel/traps.c	1.37    -> 1.38   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/18	eranian@hpl.hp.com	1.1239.1.13
# [PATCH] ia64: pass si_isr for a few more signal sources
# 
# This patch changes the kernel such that si_isr gets setup for hardware
# breakpoints, single-step, and taken-branch traps.  This is useful, e.g., to
# determine what kind of hw breakpoint triggered the signal.
# --------------------------------------------
#
diff -Nru a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
--- a/arch/ia64/kernel/traps.c	Fri Sep 19 00:40:11 2003
+++ b/arch/ia64/kernel/traps.c	Fri Sep 19 00:40:11 2003
@@ -568,10 +568,10 @@
 		}
 		siginfo.si_signo = SIGTRAP;
 		siginfo.si_errno = 0;
-		siginfo.si_flags = 0;
-		siginfo.si_isr = 0;
-		siginfo.si_addr = (void *) ifa;
-		siginfo.si_imm = 0;
+		siginfo.si_addr  = (void *) ifa;
+		siginfo.si_imm   = 0;
+		siginfo.si_flags = __ISR_VALID;
+		siginfo.si_isr   = isr;
 		force_sig_info(SIGTRAP, &siginfo, current);
 		return;